From a5869f4c5055739cdbae05186181a8bea70957aa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 16 Nov 2004 02:01:41 +0000 Subject: [PATCH] Use GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints. (#158420, Morten 2004-11-15 Matthias Clasen * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): * gtk/gtkbutton.c (gtk_button_screen_changed): Use GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints. (#158420, Morten Welinder) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkbutton.c | 6 +++--- gtk/gtkimagemenuitem.c | 6 +++--- 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83248c621a..ded0de74a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-15 Matthias Clasen + + * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): + * gtk/gtkbutton.c (gtk_button_screen_changed): Use + GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints. (#158420, + Morten Welinder) + Mon Nov 15 17:17:17 2004 Manish Singh * configure.in: Output Makefile for the pixbuf engine directory. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 83248c621a..ded0de74a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-11-15 Matthias Clasen + + * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): + * gtk/gtkbutton.c (gtk_button_screen_changed): Use + GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints. (#158420, + Morten Welinder) + Mon Nov 15 17:17:17 2004 Manish Singh * configure.in: Output Makefile for the pixbuf engine directory. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 83248c621a..ded0de74a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-11-15 Matthias Clasen + + * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): + * gtk/gtkbutton.c (gtk_button_screen_changed): Use + GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints. (#158420, + Morten Welinder) + Mon Nov 15 17:17:17 2004 Manish Singh * configure.in: Output Makefile for the pixbuf engine directory. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 83248c621a..ded0de74a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-11-15 Matthias Clasen + + * gtk/gtkimagemenuitem.c (gtk_image_menu_item_screen_changed): + * gtk/gtkbutton.c (gtk_button_screen_changed): Use + GPOINTER_TO_UINT()/GUINT_TO_POINTER() for guints. (#158420, + Morten Welinder) + Mon Nov 15 17:17:17 2004 Manish Singh * configure.in: Output Makefile for the pixbuf engine directory. diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index a60314ce59..3f958015a4 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -1696,8 +1696,8 @@ gtk_button_screen_changed (GtkWidget *widget, settings = gtk_widget_get_settings (widget); show_image_connection = - GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings), - "gtk-button-connection")); + GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (settings), + "gtk-button-connection")); if (show_image_connection) return; @@ -1707,7 +1707,7 @@ gtk_button_screen_changed (GtkWidget *widget, G_CALLBACK (gtk_button_setting_changed), 0); g_object_set_data (G_OBJECT (settings), "gtk-button-connection", - GINT_TO_POINTER (show_image_connection)); + GUINT_TO_POINTER (show_image_connection)); show_image_change_notify (GTK_BUTTON (widget)); } diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index 0690a33511..134e766bd5 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -589,8 +589,8 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget, settings = gtk_widget_get_settings (widget); show_image_connection = - GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings), - "gtk-image-menu-item-connection")); + GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (settings), + "gtk-image-menu-item-connection")); if (show_image_connection) return; @@ -600,7 +600,7 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget, G_CALLBACK (gtk_image_menu_item_setting_changed), 0); g_object_set_data (G_OBJECT (settings), "gtk-image-menu-item-connection", - GINT_TO_POINTER (show_image_connection)); + GUINT_TO_POINTER (show_image_connection)); show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget)); } -- 2.30.2